Renamed naming conventions from old style
A bit more debuggy