Conform to standard naming convention