Export services and change names to reflect purpose