small renamings and helper methods