changed some names to get rid of warnings about name clashes.