Fixed method names for sonar checks