Hey Walter
THere have been some changes in since 2.1.5 regarding those module locations. Im not 100% sure if it will address your problem though. I would suggest updating to the latest version and making sure the relevant templates are reverted. If they are still wacked out, then I can tackle it for you.
HTHs!