Is your feature request related to a problem? Please describe.

Names of folders are confusing - rds_1, security-group_1...

Describe the solution you'd like

Use names from components, replace strange characters with single _

Additional context