naming changes for conformity