Switch to format strings for naming_scheme