fix naming
formatting
app naming