Slightly improve identifiers and update texts