Renaming; Comments added