Bug Fix: Class name corrections