AFP and SAMBA shares are confusing my MacOS X Lion

view story

http://askubuntu.com – I've setup my file server running ubuntu 12.04 with AFP/Avahi and Samba shares. Simple configuration, nothing too complicated. I've given my AFP machine a different name than %h to avoid confusion when looking into my Finder. However, my mac os lion mbp still confuses the two and the only way to access the AFP shares is via direct connect to IP address. The samba machine name seems to be hardwired to hostname (I can only see that that workgroup can be changed). Is there anything I am missing or obvious that I need to set? Best regards and thank you in advanced Pierre (HowTos)