change name of L1 fns to match conventions
updates and renamings