changes due to naming conflict