Changed some class names

Same as #145.