Variable rename
Id rename for clarity
Reorganized container structure