Removed abstract names confusion