Bugfixes and naming updates.