Minor fixes and name changes