fix some embarassing naming conflicts