Renamed methods to for diagnostics module to pass