Tried better naming for the sake of the package