Changed around some names in Firebase