name scheme fix