Clean fallback from outdated prefix
Reduce library size by smaller property names