Some renaming of resources to make consistent

Signed-off-by: dpulitano <dan3124@gmail.com>