Rename: defineServices -> declareServices
Improve JSON descriptor implementation
Correct JavaDoc