update naming scheme from Java-esque to C style