Renaming and a few small changes