Fixed bug and changed names