alarm/uboot-sunxi fixes, name unification