Rename & bug fixes