Did some renaming to resolve name clashes.