naming conventions

changed a few