Rename class to remove noise