Fixed application names clashing