|#607| Service and repo API renamed