Indianna Level 2 : Renaming + fixing some bugs