Rename and cleanup some features