Fix names and strip seconds