Modification in Navigation and Naming Convention