Clean up naming of feature