ARM: rename some generic routines