Fixed naming based on Sonar input