Added fully qualified names to avoid future import bugs.