Renaming and fix nasty bug