[SQUASH ME] basic_mac: address more comments
[SQUASH ME] basic_mac: one rename more

https://www.youtube.com/watch?v=-qkf0fLU2Ao