Rename to aputs.
Also, simplify code by moving some common code out to macros.
Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>