Rename class to match other internal classes