Renamed remaining files/directories
Renamed virtual attributes