Rename everything to make more sense to a outside user