diff --git a/src/@types/partials.ts b/src/@types/partials.ts
index d2b286e83..4daa935d0 100644
--- a/src/@types/partials.ts
+++ b/src/@types/partials.ts
@@ -17,7 +17,7 @@ limitations under the License.
 export interface IImageInfo {
     size?: number;
     mimetype?: string;
-    thumbnail_info?: {
+    thumbnail_info?: { // eslint-disable-line camelcase
         w?: number;
         h?: number;
         size?: number;
diff --git a/src/@types/requests.ts b/src/@types/requests.ts
index 6f6795eea..48c379670 100644
--- a/src/@types/requests.ts
+++ b/src/@types/requests.ts
@@ -40,12 +40,12 @@ export interface IRedactOpts {
 }
 
 export interface ISendEventResponse {
-    event_id: string;
+    event_id: string; // eslint-disable-line camelcase
 }
 
 export interface IPresenceOpts {
     presence: "online" | "offline" | "unavailable";
-    status_msg?: string;
+    status_msg?: string; // eslint-disable-line camelcase
 }
 
 export interface IPaginateOpts {
@@ -69,18 +69,21 @@ export interface IEventSearchOpts {
 }
 
 export interface ICreateRoomOpts {
-    room_alias_name?: string;
+    room_alias_name?: string; // eslint-disable-line camelcase
     visibility?: "public" | "private";
     name?: string;
     topic?: string;
-    invite_3pid?: any[]; // TODO: Types
+    // TODO: Types (next line)
+    invite_3pid?: any[]; // eslint-disable-line camelcase
 }
 
 export interface IRoomDirectoryOptions {
     server?: string;
     limit?: number;
     since?: string;
-    filter?: any & {generic_search_term: string}; // TODO: Types
+
+    // TODO: Proper types
+    filter?: any & {generic_search_term: string};  // eslint-disable-line camelcase
 }
 
 export interface IUploadOpts {
diff --git a/src/client.ts b/src/client.ts
index 276f0c787..f316fa1c1 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -45,7 +45,7 @@ import {
     PREFIX_MEDIA_R0,
     PREFIX_R0,
     PREFIX_UNSTABLE,
-    retryNetworkOperation
+    retryNetworkOperation,
 } from "./http-api";
 import { Crypto, DeviceInfo, fixBackupKey, isCryptoAvailable } from './crypto';
 import { decodeRecoveryKey } from './crypto/recoverykey';
@@ -61,7 +61,7 @@ import {
     IKeyBackupRoomSessions,
     IKeyBackupSession,
     IKeyBackupTrustInfo,
-    IKeyBackupVersion
+    IKeyBackupVersion,
 } from "./crypto/keybackup";
 import { PkDecryption } from "olm";
 import { IIdentityServerProvider } from "./@types/IIdentityServerProvider";
@@ -86,7 +86,7 @@ import {
     IEncryptedEventInfo,
     IImportRoomKeysOpts,
     IRecoveryKey,
-    ISecretStorageKey
+    ISecretStorageKey,
 } from "./crypto/api";
 import { CrossSigningInfo, UserTrustLevel } from "./crypto/CrossSigning";
 import { Room } from "./models/Room";
@@ -99,7 +99,8 @@ import {
     IPresenceOpts,
     IRedactOpts, IRoomDirectoryOptions,
     ISearchOpts,
-    ISendEventResponse, IUploadOpts
+    ISendEventResponse,
+    IUploadOpts,
 } from "./@types/requests";
 import { EventType } from "./@types/event";
 import { IImageInfo } from "./@types/partials";
@@ -397,7 +398,7 @@ export class MatrixClient extends EventEmitter {
     private canSupportVoip = false;
     private peekSync: SyncApi = null;
     private isGuestAccount = false;
-    private ongoingScrollbacks:{[roomId: string]: {promise?: Promise<any>, errorTs: number}} = {}; // TODO: Types
+    private ongoingScrollbacks: {[roomId: string]: {promise?: Promise<any>, errorTs: number}} = {}; // TODO: Types
     private notifTimelineSet: EventTimelineSet = null;
     private cryptoStore: CryptoStore;
     private verificationMethods: string[];
@@ -816,7 +817,11 @@ export class MatrixClient extends EventEmitter {
      *     dehydrated device.
      * @return {Promise} A promise that resolves when the dehydrated device is stored.
      */
-    public async setDehydrationKey(key: Uint8Array, keyInfo: IDehydratedDeviceKeyInfo, deviceDisplayName?: string): Promise<void> {
+    public async setDehydrationKey(
+        key: Uint8Array,
+        keyInfo: IDehydratedDeviceKeyInfo,
+        deviceDisplayName?: string
+    ): Promise<void> {
         if (!this.crypto) {
             logger.warn('not dehydrating device if crypto is not enabled');
             return;
@@ -7798,7 +7803,6 @@ export class MatrixClient extends EventEmitter {
     }
 }
 
-
 /**
  * Fires whenever the SDK receives a new event.
  * <p>
diff --git a/src/crypto/dehydration.ts b/src/crypto/dehydration.ts
index 81d9d17bf..5e431be62 100644
--- a/src/crypto/dehydration.ts
+++ b/src/crypto/dehydration.ts
@@ -25,8 +25,8 @@ import { ISecretStorageKeyInfo } from "../matrix";
 type Signatures = Record<string, Record<string, string>>;
 
 export interface IDehydratedDevice {
-    device_id: string;
-    device_data: ISecretStorageKeyInfo & {
+    device_id: string; // eslint-disable-line camelcase
+    device_data: ISecretStorageKeyInfo & { // eslint-disable-line camelcase
         algorithm: string;
         account: string; // pickle
     };
diff --git a/src/crypto/keybackup.ts b/src/crypto/keybackup.ts
index 1065f256a..9c816384e 100644
--- a/src/crypto/keybackup.ts
+++ b/src/crypto/keybackup.ts
@@ -18,10 +18,10 @@ import { ISignatures } from "../@types/signed";
 import { DeviceInfo } from "./deviceinfo";
 
 export interface IKeyBackupSession {
-    first_message_index: number;
-    forwarded_count: number;
-    is_verified: boolean;
-    session_data: {
+    first_message_index: number; // eslint-disable-line camelcase
+    forwarded_count: number; // eslint-disable-line camelcase
+    is_verified: boolean; // eslint-disable-line camelcase
+    session_data: { // eslint-disable-line camelcase
         ciphertext: string;
         ephemeral: string;
         mac: string;
@@ -34,8 +34,8 @@ export interface IKeyBackupRoomSessions {
 
 export interface IKeyBackupVersion {
     algorithm: string;
-    auth_data: {
-        public_key: string;
+    auth_data: { // eslint-disable-line camelcase
+        public_key: string; // eslint-disable-line camelcase
         signatures: ISignatures;
     };
     count: number;
diff --git a/src/event-mapper.ts b/src/event-mapper.ts
index bc04f5e71..84b8b306f 100644
--- a/src/event-mapper.ts
+++ b/src/event-mapper.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { MatrixClient } from "./client";
-import {MatrixEvent} from "./models/event";
+import { MatrixEvent } from "./models/event";
 
 export type EventMapper = (obj: any) => MatrixEvent;
 
@@ -27,6 +27,7 @@ export interface MapperOpts {
 export function eventMapperFor(client: MatrixClient, options: MapperOpts): EventMapper {
     const preventReEmit = Boolean(options.preventReEmit);
     const decrypt = options.decrypt !== false;
+
     function mapper(plainOldJsObject) {
         const event = new MatrixEvent(plainOldJsObject);
         if (event.isEncrypted()) {
@@ -44,5 +45,6 @@ export function eventMapperFor(client: MatrixClient, options: MapperOpts): Event
         }
         return event;
     }
+
     return mapper;
 }