diff --git a/pkg/jmap/jmap_api.go b/pkg/jmap/api.go
similarity index 100%
rename from pkg/jmap/jmap_api.go
rename to pkg/jmap/api.go
diff --git a/pkg/jmap/jmap_api_blob.go b/pkg/jmap/api_blob.go
similarity index 100%
rename from pkg/jmap/jmap_api_blob.go
rename to pkg/jmap/api_blob.go
diff --git a/pkg/jmap/jmap_api_bootstrap.go b/pkg/jmap/api_bootstrap.go
similarity index 100%
rename from pkg/jmap/jmap_api_bootstrap.go
rename to pkg/jmap/api_bootstrap.go
diff --git a/pkg/jmap/jmap_api_calendar.go b/pkg/jmap/api_calendar.go
similarity index 100%
rename from pkg/jmap/jmap_api_calendar.go
rename to pkg/jmap/api_calendar.go
diff --git a/pkg/jmap/jmap_api_contact.go b/pkg/jmap/api_contact.go
similarity index 100%
rename from pkg/jmap/jmap_api_contact.go
rename to pkg/jmap/api_contact.go
diff --git a/pkg/jmap/jmap_api_email.go b/pkg/jmap/api_email.go
similarity index 100%
rename from pkg/jmap/jmap_api_email.go
rename to pkg/jmap/api_email.go
diff --git a/pkg/jmap/jmap_api_identity.go b/pkg/jmap/api_identity.go
similarity index 100%
rename from pkg/jmap/jmap_api_identity.go
rename to pkg/jmap/api_identity.go
diff --git a/pkg/jmap/jmap_api_mailbox.go b/pkg/jmap/api_mailbox.go
similarity index 100%
rename from pkg/jmap/jmap_api_mailbox.go
rename to pkg/jmap/api_mailbox.go
diff --git a/pkg/jmap/jmap_api_quota.go b/pkg/jmap/api_quota.go
similarity index 100%
rename from pkg/jmap/jmap_api_quota.go
rename to pkg/jmap/api_quota.go
diff --git a/pkg/jmap/jmap_api_vacation.go b/pkg/jmap/api_vacation.go
similarity index 100%
rename from pkg/jmap/jmap_api_vacation.go
rename to pkg/jmap/api_vacation.go
diff --git a/pkg/jmap/jmap_api_ws.go b/pkg/jmap/api_ws.go
similarity index 100%
rename from pkg/jmap/jmap_api_ws.go
rename to pkg/jmap/api_ws.go
diff --git a/pkg/jmap/jmap_client.go b/pkg/jmap/client.go
similarity index 100%
rename from pkg/jmap/jmap_client.go
rename to pkg/jmap/client.go
diff --git a/pkg/jmap/jmap_error.go b/pkg/jmap/error.go
similarity index 100%
rename from pkg/jmap/jmap_error.go
rename to pkg/jmap/error.go
diff --git a/pkg/jmap/jmap_http.go b/pkg/jmap/http.go
similarity index 100%
rename from pkg/jmap/jmap_http.go
rename to pkg/jmap/http.go
diff --git a/pkg/jmap/jmap_integration_contact_test.go b/pkg/jmap/integration_contact_test.go
similarity index 100%
rename from pkg/jmap/jmap_integration_contact_test.go
rename to pkg/jmap/integration_contact_test.go
diff --git a/pkg/jmap/jmap_integration_email_test.go b/pkg/jmap/integration_email_test.go
similarity index 100%
rename from pkg/jmap/jmap_integration_email_test.go
rename to pkg/jmap/integration_email_test.go
diff --git a/pkg/jmap/jmap_integration_event_test.go b/pkg/jmap/integration_event_test.go
similarity index 100%
rename from pkg/jmap/jmap_integration_event_test.go
rename to pkg/jmap/integration_event_test.go
diff --git a/pkg/jmap/jmap_integration_test.go b/pkg/jmap/integration_test.go
similarity index 100%
rename from pkg/jmap/jmap_integration_test.go
rename to pkg/jmap/integration_test.go
diff --git a/pkg/jmap/jmap_integration_ws_test.go b/pkg/jmap/integration_ws_test.go
similarity index 100%
rename from pkg/jmap/jmap_integration_ws_test.go
rename to pkg/jmap/integration_ws_test.go
diff --git a/pkg/jmap/jmap_model.go b/pkg/jmap/model.go
similarity index 100%
rename from pkg/jmap/jmap_model.go
rename to pkg/jmap/model.go
diff --git a/pkg/jmap/jmap_model_examples.go b/pkg/jmap/model_examples.go
similarity index 100%
rename from pkg/jmap/jmap_model_examples.go
rename to pkg/jmap/model_examples.go
diff --git a/pkg/jmap/jmap_model_examples_test.go b/pkg/jmap/model_examples_test.go
similarity index 100%
rename from pkg/jmap/jmap_model_examples_test.go
rename to pkg/jmap/model_examples_test.go
diff --git a/pkg/jmap/jmap_session.go b/pkg/jmap/session.go
similarity index 100%
rename from pkg/jmap/jmap_session.go
rename to pkg/jmap/session.go
diff --git a/pkg/jmap/jmap_tools.go b/pkg/jmap/tools.go
similarity index 100%
rename from pkg/jmap/jmap_tools.go
rename to pkg/jmap/tools.go
diff --git a/pkg/jmap/jmap_tools_test.go b/pkg/jmap/tools_test.go
similarity index 100%
rename from pkg/jmap/jmap_tools_test.go
rename to pkg/jmap/tools_test.go
diff --git a/pkg/jscalendar/jscalendar_model.go b/pkg/jscalendar/model.go
similarity index 100%
rename from pkg/jscalendar/jscalendar_model.go
rename to pkg/jscalendar/model.go
diff --git a/pkg/jscalendar/jscalendar_model_test.go b/pkg/jscalendar/model_test.go
similarity index 100%
rename from pkg/jscalendar/jscalendar_model_test.go
rename to pkg/jscalendar/model_test.go
diff --git a/pkg/jscontact/jscontact_model.go b/pkg/jscontact/model.go
similarity index 100%
rename from pkg/jscontact/jscontact_model.go
rename to pkg/jscontact/model.go
diff --git a/pkg/jscontact/jscontact_model_test.go b/pkg/jscontact/model_test.go
similarity index 100%
rename from pkg/jscontact/jscontact_model_test.go
rename to pkg/jscontact/model_test.go
diff --git a/services/groupware/pkg/groupware/groupware_api.go b/services/groupware/pkg/groupware/api.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api.go
rename to services/groupware/pkg/groupware/api.go
diff --git a/services/groupware/pkg/groupware/groupware_api_account.go b/services/groupware/pkg/groupware/api_account.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_account.go
rename to services/groupware/pkg/groupware/api_account.go
diff --git a/services/groupware/pkg/groupware/groupware_api_blob.go b/services/groupware/pkg/groupware/api_blob.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_blob.go
rename to services/groupware/pkg/groupware/api_blob.go
diff --git a/services/groupware/pkg/groupware/groupware_api_calendars.go b/services/groupware/pkg/groupware/api_calendars.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_calendars.go
rename to services/groupware/pkg/groupware/api_calendars.go
diff --git a/services/groupware/pkg/groupware/groupware_api_contacts.go b/services/groupware/pkg/groupware/api_contacts.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_contacts.go
rename to services/groupware/pkg/groupware/api_contacts.go
diff --git a/services/groupware/pkg/groupware/groupware_api_emails.go b/services/groupware/pkg/groupware/api_emails.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_emails.go
rename to services/groupware/pkg/groupware/api_emails.go
diff --git a/services/groupware/pkg/groupware/groupware_api_identity.go b/services/groupware/pkg/groupware/api_identity.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_identity.go
rename to services/groupware/pkg/groupware/api_identity.go
diff --git a/services/groupware/pkg/groupware/groupware_api_index.go b/services/groupware/pkg/groupware/api_index.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_index.go
rename to services/groupware/pkg/groupware/api_index.go
diff --git a/services/groupware/pkg/groupware/groupware_api_mailbox.go b/services/groupware/pkg/groupware/api_mailbox.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_mailbox.go
rename to services/groupware/pkg/groupware/api_mailbox.go
diff --git a/services/groupware/pkg/groupware/groupware_api_quota.go b/services/groupware/pkg/groupware/api_quota.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_quota.go
rename to services/groupware/pkg/groupware/api_quota.go
diff --git a/services/groupware/pkg/groupware/groupware_api_tasklists.go b/services/groupware/pkg/groupware/api_tasklists.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_tasklists.go
rename to services/groupware/pkg/groupware/api_tasklists.go
diff --git a/services/groupware/pkg/groupware/groupware_api_vacation.go b/services/groupware/pkg/groupware/api_vacation.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_api_vacation.go
rename to services/groupware/pkg/groupware/api_vacation.go
diff --git a/services/groupware/pkg/groupware/groupware_dns.go b/services/groupware/pkg/groupware/dns.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_dns.go
rename to services/groupware/pkg/groupware/dns.go
diff --git a/services/groupware/pkg/groupware/groupware_docs.go b/services/groupware/pkg/groupware/docs.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_docs.go
rename to services/groupware/pkg/groupware/docs.go
diff --git a/services/groupware/pkg/groupware/groupware_error.go b/services/groupware/pkg/groupware/error.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_error.go
rename to services/groupware/pkg/groupware/error.go
diff --git a/services/groupware/pkg/groupware/groupware_examples_test.go b/services/groupware/pkg/groupware/examples_test.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_examples_test.go
rename to services/groupware/pkg/groupware/examples_test.go
diff --git a/services/groupware/pkg/groupware/groupware_framework.go b/services/groupware/pkg/groupware/framework.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_framework.go
rename to services/groupware/pkg/groupware/framework.go
diff --git a/services/groupware/pkg/groupware/groupware_mock_tasks.go b/services/groupware/pkg/groupware/mock_tasks.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_mock_tasks.go
rename to services/groupware/pkg/groupware/mock_tasks.go
diff --git a/services/groupware/pkg/groupware/groupware_request.go b/services/groupware/pkg/groupware/request.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_request.go
rename to services/groupware/pkg/groupware/request.go
diff --git a/services/groupware/pkg/groupware/groupware_response.go b/services/groupware/pkg/groupware/response.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_response.go
rename to services/groupware/pkg/groupware/response.go
diff --git a/services/groupware/pkg/groupware/groupware_reva.go b/services/groupware/pkg/groupware/reva.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_reva.go
rename to services/groupware/pkg/groupware/reva.go
diff --git a/services/groupware/pkg/groupware/groupware_route.go b/services/groupware/pkg/groupware/route.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_route.go
rename to services/groupware/pkg/groupware/route.go
diff --git a/services/groupware/pkg/groupware/groupware_session.go b/services/groupware/pkg/groupware/session.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_session.go
rename to services/groupware/pkg/groupware/session.go
diff --git a/services/groupware/pkg/groupware/groupware_test.go b/services/groupware/pkg/groupware/test.go
similarity index 100%
rename from services/groupware/pkg/groupware/groupware_test.go
rename to services/groupware/pkg/groupware/test.go