Replaced ugly type names