updated naming things, tweaked firebase scaffolding