Replaced camelcase naming with normal one