Simplify and rename F2m functions