fixed the rename problem and also some style changes