UPDATE: Use correct classname