New class names

Welcome back!  Our class names have changed...here's a reminder.