Modification to naming conventions
Minor cleanup