Refactor helper class name for orientation, so its not confused with the system classes.