fixed bug with naming