naming convention + fixes