Appended _func function names, added Organic style macros.