fixing namespace management