Changed naming style