Refactor serie name decoder

Change-Id: If82475bdf638270f2afdfb3b890a4f70ffdf7ff7