Minor service improvements, refactored repository names