Fixed references to their class hard-coded as this specific class.