updated some function names
renamed cycamore module funcs to be CapCase
resolved some comflicts
fixes straggler func names