Fix some naming conventions

@jault3 this one will have some breaking changes on the API. It changes method names on the builders.