Renamed all Functions and Aliases According to New Naming Conventions