Got rid of underscroes in names for psr