Remove naming convention

Remove the modifications done on the naming convention, leaving only
modifications over formatting typos and terminology.