* Changes for getting correct name of object.