Clean up application loading, standardize naming