Removed fully qualified names