Change naming.
All done with taking out features.