Using Builder naming convention to be consistent with the rest of the project