Rename class, and remove some methods used for syntax compatibility