another attempt to fix naming problem