fixed bugs with naming