updated some function names
resolved some comflicts
fixes straggler func names