Slight fixes to namings