Unified the usage of id/name attributes. Fixes #69.