Better function naming
Make it Moovweb compliant