rename oc.functions -> oc.function
Pre switch to Java 8
start migration to Java 8