continued naming convention cleanup
final naming convention mods