Changed naming and namespace