Rename class so less confusing