New fomfunctions version. Changed names of FOMs for improved consistency and conciseness