Name change and general cleanup.