Pass more variables to submakes
Removed C_ prefix from some core functions