more uniform names
2 files changed