bug fixes: @Name annotation enhancement