Class name changes, code clean up