Reworked builtin proc definitions to use a macro
Fixed typo in function name