Bring Abilities up to naming standard