Made magic strings into named constants for model converter