fixing some names..