updated some names
minor fixes