Merge "Modify getter name to match the project naming convention"