Fix package name for @Self and @SubResource

The package name was not sync with the folder they were in.