Agree, better naming can be fixed as well :)