Changed format names to format codes