Change naming conventions to srv