Refactor serial macro to the new name specs.