some renaming
merge with master