Renamed All Functions and Aliases According to New Naming Conventions