Bug Fix: Use the type name as application key