Merge "Fixed inconsistencies in yang types method names."