Rename a few classes to ensure they are correctly named (camel case issue)
Add retention + target