Are there not references to this that should be renamed too?