Correcting variable names + Class -> Class<Feeling>