Replaced methods names with call to method name getter