Changed naming to conform to standard