Fix constant typing from module to class
Use smash when defaulting to prevent key typing issues