Make naming more consistent and obey codestyle