Class naming

Last try before final at break everything. :angel: