naming conventions

standardising