Refactored the names of the subscription table