cleaned up names (removed hypens) to make integration easier