Minor bug-fixes and ID name changes