Fixed bug and renamed