Remove standardized naming convention