Updated services to use modified type names