spec4: Rename and remove unused methods