abdt_naming: refactor, rm unused funcs