some renaming and possible cleanup