Refactored some types/names