updated some renaming bugs
updated some renaming bugs