Standadizing naming convention