Small fixes regarding convention, memory leak, and naming

2 jobs for !92 with issue_297 in 6 minutes and 16 seconds (queued for 2 seconds)
latest merge request