shorter resources names
Revert "shorter resources names"

This reverts commit c1d3c51161d4d379b295ea40916f1894e0e668c4.
shorter resources names

+cleaning