implement @Name to fix #21