Several helpers added, renamings