Changed name to username rather