Update naming convention to make more sense