Fixed classe names.