[TASK] Layout and keep extensionName